bitkeeper revision 1.1159.212.79 (42025949UaM5lFgjnH_ynRCAqL6hhQ)

Merge planb.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-2.0-testing.bk
into planb.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk

diff --cc BitKeeper/etc/logging_ok
index b246720e36dcb02f48cc65292e00f66d86f1f121,f2a27dc63d84a86d2ff49c48492459e9fac8ee99..ccf69153cb37e1f1d1da1e58ba7c9f0a27de6dad
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -28,11 -26,9 +28,12 @@@ iap10@tetris.cl.cam.ac.u
  jws22@gauntlet.cl.cam.ac.uk
  jws@cairnwell.research
  kaf24@camelot.eng.3leafnetworks.com
 +kaf24@firebug.cl.cam.ac.uk
  kaf24@freefall.cl.cam.ac.uk
  kaf24@labyrinth.cl.cam.ac.uk
 +kaf24@pb001.cl.cam.ac.uk
  kaf24@penguin.local
++kaf24@planb.cl.cam.ac.uk
  kaf24@plym.cl.cam.ac.uk
  kaf24@scramble.cl.cam.ac.uk
  kaf24@striker.cl.cam.ac.uk

diff --cc xen/common/page_alloc.c
Simple merge